From 07f80fecc13d1df96229d7e035847c3f1fd3f339 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 5 Feb 2010 20:23:59 -0800 Subject: [PATCH] * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header. --- lisp/ChangeLog | 4 ++++ lisp/vc-bzr.el | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7de4f270f87..2046ad354ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-02-06 Dan Nicolaescu + + * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header. + 2010-02-05 Juri Linkov * doc-view.el (doc-view-mode): diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 1b0206ce70c..efeb19de4c7 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -796,8 +796,12 @@ stream. Standard error output is discarded." (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves") (root-dir (vc-bzr-root dir)) (pending-merge - (file-exists-p - (expand-file-name ".bzr/checkout/merge-hashes" root-dir))) + ;; FIXME: looking for .bzr/checkout/merge-hashes is not a + ;; reliable method to detect pending merges, disable this + ;; until a proper solution is implemented. + (and nil + (file-exists-p + (expand-file-name ".bzr/checkout/merge-hashes" root-dir)))) (pending-merge-help-echo (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir)) (light-checkout -- 2.30.2